Merge "Stop saving ActionMenuItemView state." into nyc-dev
am: 6d3a6e039c

* commit '6d3a6e039c0a198dd19db745458754edacab7705':
  Stop saving ActionMenuItemView state.

Change-Id: I96b3f350b124e471aae6679a37baeb3078a6830a