Merge "Revert "Adding hasSystemFeature entry for CSHelper"" into main