Merge "Fix issue with lagging pip movement after entering/exiting dismiss" into sc-dev