Merge "Optimize latency when unlocking phone" into oc-dev