Merge "Fixed a bug with the emergency affordance in multi user" into nyc-mr2-dev