Merge "Remove redundant lockscreen shown check" into oc-dev