Merge "Explicitly re-show rather than reset keyguard if we're not interactive." into tm-qpr-dev