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

Change-Id: Ic4ca28c50d86a02b31d6400aa7e6cf797267bf28