Merge "Don't increment the paint's generation ID when drawing bitmaps" into jb-mr2-dev