Merge "forceUpdateUserSetupComplete should have no effect in user build"