Merge changes If7c3a55e,I68dcba41,Ib96a15da into nyc-mr1-dev

* changes:
  Fixed a bug where the dimmed background could be invisible
  Fixed an issue where the inline controls where not usable
  Added Emergency affordance feature