Merge "Revert "Refactor: Group AppOps related info together"" into 24D1-dev