21175 - Fixed problem with pickers not being cleared when the filter is changed. (master)

Pull to Master.