Merge "Adopt changes in MotionTestRule API" into main