Merge pull request #12133 from mandar1jn/skylanders-improved-generation Skylanders: Improve figure data view and generation