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

* commit 'b9bb8e88c66a80ca43e5aabad94348fdaf0fef1d':
  Stop saving ActionMenuItemView state.

Change-Id: Ic8ee0f6d55cae78dd6da72ea8ea269b1ad735753