Merge pull request #18323 from demeritcowboy/reminder-groups-dropdown