Merge "Update setSystemSelectionChannels to use valid channels" into main