Merge "Update ListMenuItemView to use a single RelativeLayout"