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

Change-Id: I09a8181bcddc14462cb0756fcc4977636b7d4698