Merge "Fix bug 5168889 - action bar not respecting return codes of onCreate/Prepare menu"