Merge "Fix bouncer always being on the left side" into udc-qpr-dev