Merge "Allow forceUpdateUserSetupComplete for non system users" into sc-dev