Merge "wakeAndUnlock latency fixes"