Merge "Disable flaky MR2ManagerTests" into main