Merge changes I98d775b7,I4f2ee780

* changes:
  Only bubble music / call notifications, not all ongoing
  Require category message when auto-bubbling messages