Merge "Support UDFPS alternate bouncer -> primary bouncer transition" into main