Merge "Use std::vector instead of VLA for addMovement"