Merge commit '07e7e3f4be8fac3b7b6b2bea492429d66fbb0a9c' into eclair-mr2-plus-aosp * commit '07e7e3f4be8fac3b7b6b2bea492429d66fbb0a9c': Disabling user activity now resets user power state so the keyguard can set short screen timeout when keyguard is unhidden.