Merge "Retain recommendations (if possible) while picker is open" into main