Merge "Don't hide the alternate bouncer on keyguardReset" into tm-qpr-dev