Merge "Migrate the last of the failing MenuItem tests" into sc-dev