Merge "Fix action bar menu inflation context" into lmp-preview-dev