Merge "Revert "Update ListMenuItemView to use a single RelativeLayout""