Merge "Ensure that a canvas is always backed by some form of SkDevice." into jb-mr2-dev