Merge "Only reinflate bouncer after rotation if flag enabled" into udc-qpr-dev