am 6f090af3: am ebd1dca5: Merge "Re-enable ActionMenuPresenter view recycling" into klp-dev

* commit '6f090af305eba51785bb9a6ec08fb9f86a73da98':
  Re-enable ActionMenuPresenter view recycling