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

Change-Id: Ice186f09800dc2254856c71f50d14580acf5f5d5