Merge changes from topic "mm-bubble-updates" into tm-qpr-dev

* changes:
  If the update is non-interruptive don't re-bubble it
  Don't bubble things when we shouldn't
  Ignore updates to bubbles that aren't from the system