Merge "Change behavior of setBitmap to cleanly reset the canvas" into oc-dev
am: 7944962b7e

Change-Id: Iced04463ac3e7f0ff696f2cf75dc064cf704863f