Merge "Reset select filter on close." into main