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

Change-Id: I32b86bf196dc1ecbf36efd11a1321d19f1854ff1