Merge "Fix AppOpsStartedWatcherTest" into main