Merge "Fix errant bouncer/keyboard display over keyguard" into tm-qpr-dev