Merge "Fix Compose motion tests" into main