Apply new guider styles for borders and shadows

Change-Id: I381ccbc110e61bfca9d078fa1de5cda1ee308435
Merge "Apply new guider styles for borders and shadows"