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

Change-Id: Ib3c604789d274c3a3dd5f97bcaba501730feda66