Merge "Annotate existing motion tests with @MotionTest" into main