Merge change Id8c9cb2f into eclair

* changes:
  More fix #2163209: alarm clock rings but is hidden behind lock screen