Merge "Handle reordering when recommendation clicked." into main