am f80ea6a9: Merge "Fix lockscreen occluded states #2."

* commit 'f80ea6a9a7ef17e67a0f528659347ab0b3242f09':
  Fix lockscreen occluded states #2.