Merge "Postpone AppOps call to fix deadlock." into main