Merge "Improve asynchronous SVG loading performance" into devel/master