Merge "Maintain mSetupCompletedUsers for profiles correctly" into nyc-dev