Merge "Prefer upsizing a down-sampled picture if size is close enough" into jb-mr1-dev