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