Merge "Display proper error if file diff fails because content is too large" into stable-2.4