Merge "Fixed an issue where the lockscreen could be all white" into oc-dr1-dev