Merge "Bouncer isn't in transit when fully visible/hidden" into qt-r1-dev
am: c2877e1197

Change-Id: I4886a6926304f84dc32026a609f9bd5471d57235