Merge "Support of low-latency WifiLocks"