Merge "Defer AllAppsUpdate while edu test is running" into sc-dev