Merge "Reapply "Refactor: Group AppOps related info together"" into main