Merge "Don't dismiss the keyguard from the binder thread" into tm-qpr-dev