Merge "remove remaining refs to max_image_sizes" into gingerbread