Merge "Merge "Do not show bouncer field when bouncer is hidden" into qt-dev am: 8bf9743b59" into qt-dev-plus-aosp