Merge changes I5c096c2b,If0d0d86b into sc-dev

* changes:
  PIP dismiss updates
  Bubble dismiss updates