Merge "Change behavior of setBitmap to cleanly reset the canvas" into oc-dev