Merge "Do not show bouncer field when bouncer is hidden" into qt-dev