Merge "Fixed texture-manager crash for async load complete" into devel/master