Merge "Re-enable ActionMenuPresenter view recycling" into klp-dev