Merge "Fixed an issue where the emergency affordance would show" into nyc-mr1-dev am: 7ce68fd8a4
am: f3eb11bdc1

Change-Id: I126575e006e20a008cfe44a370f026a81d73d267