* commit 'de3ff4b4859a92a19d84b33f5a93a0b3454698e6': Refactor Canvas.drawPicture() to delegate to Picture