am 7a4e7602: am 6675f691: Merge "Invalidate on new picture if scale/content...
am 7a4e7602: am 6675f691: Merge "Invalidate on new picture if scale/content size changes" into jb-dev
* commit '7a4e7602':
Invalidate on new picture if scale/content size changes