Merge "Revert "Clear the bitmap associated with canvases.""