Merge "Support asynchronous svg loading" into devel/master