Merge commit 'b134b2038ecabcbec3f9b657834d45de27707068' into eclair-plus-aosp * commit 'b134b2038ecabcbec3f9b657834d45de27707068': More fix #2163209: alarm clock rings but is hidden behind lock screen