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

Change-Id: I3f785f159c9b0e46a293acb8656eb47c9b6e4550