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