Merge "Frozen-aware AppOpsService op noted callback" into main