Merge "Revert "Revert "Revert "Extending systemUserOnly attribute to Pr..."" into main