Merge "Invalidate on new picture if scale/content size changes" into jb-dev