Merge "Check AppOp using noteOp instead os isOpActive" into main