Merge changes Ide3e8e94,I84e7c06e

* changes:
  Fixed flickering when swiping away last notification
  Fixed the order of notifications when Bubbles are present