Merge "CanvasRenderer: Add RemoveDrawable() API" into devel/master