Merge "Fix MenuInflater creation with no Action Bar" into klp-ub-dev