Merge "Allow inflateMenu() to not break ToolbarActionBar" into mnc-ub-dev