Merge "Delayed locking is only for  mDelayUserDataLocking" into main