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

Change-Id: I73e4bc5115959ae38052be25effa736576eb0ba9