Merge "Ensure SkCanvas will have a device by default." into jb-mr1-dev