Merge "Revert "Support gray out preference icon when the preference is restricted"" into main