Merge changes Idd0b38b4,I511356a8 into nyc-mr1-dev

* changes:
  Fixed a bug where the fade in from dark would not work properly
  Changed the appearance of fullscreen intent notifications again