Merge "Fix broken MenuLayoutPortraitTest"