Merge "Cancel show runnable when bouncer is hidden" into qt-r1-dev am: 859adc665b
am: e71916fc8b

Change-Id: If979d735b3b1f9ce00a531ec9774b4270258193b