Merge "Revert "Deprecate retailDemo permission protection flag."" into main