Merge "CanvasRenderer: Revise for-loop using ranged-based" into devel/master