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

Change-Id: I2a2c3731c2494a7059c8795148920a42dc978025