Merge "Fixed an issue where the emergency affordance didn't show" into nyc-mr2-dev
am: fbf2e0fb2c

Change-Id: Ib1c45af5ffea1d09e14ac5daac61a1046d2594a2