You might want to merge "really choose the largest image as a main image" 

Sorry, I cannot figure out how to make pull request just for one commit.