Merge "Adding details after a flag is not found in MotionFlags" into main