Merge "Fix lockscreen occluded states #2."