Merge "CanvasViewExample: Add DrawableGroup combination" into devel/master