Merge "WakeAndUnlock: Make sure to wait for screen turning on" into oc-dr1-dev