Merge changes Ie3736d80,I52444f4e

* changes:
  Improved collapsed messaging notifications
  Fixed a bug where the heads-up couldn't time out