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

Change-Id: I7244a108d1c358859b80adfecb551d16d4c18f1c