Merge "Fixed an issue where the emergency affordance would show" into nyc-mr1-dev