Merge "Synchronize methods accessing mWifiLocks" into sc-dev