Merge "Fix bug 5202226 - Leave menu button visible for no-button phones if targetSdk < ICS"