Merge "Fix bug 3372468 - ActionBar menu shouldn't be clickable after ActionBar.hide() is called"