Merge "Add feature flag for AppOp noteOperation batching" into main