Merge "Add multiuserDelayUserDataLocking configuration"