Merge "RenderThread animator support"