Merge "Revert "[1/n] Camera Compat Freeform: per-app controls for disabling the treatment."" into main