Merge "use the bitmap stride when encoding a screenshot as PNG" into jb-mr2-dev