Merge "Add null check for AppOpsService" into main