Merge changes from topic "bouncer-to-gone--flows" into main

* changes:
  Fix scrim alphas getting reset during the bouncer/alt-bouncer->gone transition
  Move old implementation to a separate method to make reviews easier.