Merge "Support AlternateBouncer -> Occluded transition" into main