Robust Collaborative Filtering to Popularity Distribution Shift