Merge "Moving Menu-related logic from BaseActivity to MenuManager."