am 1604d630: Merge "Fix action bar menu inflation context" into lmp-preview-dev

* commit '1604d6302a3db07a57827b1c38f7fda21c28d3c6':
  Fix action bar menu inflation context