Merge "Revert "Add per-app consent check to dev overrides"" into tm-mainline-prod