Merge "Add alternate bouncer UDFPS rotation support" into main