Merge "Stop saving ActionMenuItemView state." into nyc-dev