Merge commit 'da14742dfc0d3ed127033255d7e79fa187225420' * commit 'da14742dfc0d3ed127033255d7e79fa187225420': Do not apply keyguard's short timeout when the keyguard is hidden by another window.