Merge "Explicitly re-show the keyguard if we were hiding." into tm-qpr-dev