Merge "CanvasRenderer: Refactoring tvgObject management" into devel/master