Merge commit 'f184c68119489aa00eccba41d3babedce282518b' into eclair-mr2 * commit 'f184c68119489aa00eccba41d3babedce282518b': Ignore requests to hide the keyguard if we are in the process of waking up.