Merge "Revert "Revert "AppOps refactor for mode watchers."""