Merge "Don't call onAppsUpdated() when in testHarness" into main