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

Change-Id: I3b86cc62c28c8086ed57505581c33d7b578f893d