Merge commit '4b0b6095551bab9b9504fa581968632df9c62960' * commit '4b0b6095551bab9b9504fa581968632df9c62960': More fix #2163209: alarm clock rings but is hidden behind lock screen