Merge "Add flag check to AppOp callbacks" into main