Merge "Make sure close button has proper color" am: 0f9ad6d7f9 am: 2bb6e54317
am: f35dddaef5

Change-Id: Ie3330395e2c214b56b92cc44ae464ad7d2f48425