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

Change-Id: Iec6c4ec81a1be8f1635683a613fbde10c5dc1210