Merge commit '3d8bc316ae81b443522c812a896d42fb2978ba3d' * commit '3d8bc316ae81b443522c812a896d42fb2978ba3d': Ignore requests to hide the keyguard if we are in the process of waking up.