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