Merge changes I4ea03743,I84993c71 into main

* changes:
  [SB][Screen Chips] Immediately hide chip after stopping via dialog.
  [SB][Screen Chips] Re-add animation from chip -> stop dialog, and CUJs.