Merge "Ensure alt bouncer view is removed" into main