Merge "Only delay bouncer if bypass is off" into qt-r1-dev