Merge "Collect AsyncNotedAppOp in same call as noteOp"