Merge "Trigger svg loading early" into devel/master