Merge "Fixed a bug with the emergency affordance in multi user" into nyc-mr2-dev
am: 6a6bc370e9
Change-Id: Iae4342afea01390f6b2567832f863881907dacb0
This commit is contained in:
am: 6a6bc370e9
Change-Id: Iae4342afea01390f6b2567832f863881907dacb0