Merge "RCFilters: Make sure single_option always has 1 item selected"