Merge "Store pointers in vector inside MotionEntry" into main