Merge "Hide the alternate bouncer after dismiss actions have run" into main