Merge "Fix issue where notifications remained hidden on lock screen after two quick power presses." into sc-dev