Merge changes I56d6be69,Ibf8f9b26 into nyc-mr1-dev

* changes:
  Fixed a bug where the headsup would be stuck disappearing
  Changed the appearance of phone call notifications