Merge "Support occluded -> primary bouncer transition" into main