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