Merge "Remove invisible object in A11y Settings screens' menu" into nyc-dev

src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java

@@ -114,10 +114,12 @@ public abstract class ToggleFeaturePreferenceFragment
     @Override
     public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
         super.onCreateOptionsMenu(menu, inflater);
+        if (mSettingsTitle != null && mSettingsIntent != null) {
             MenuItem menuItem = menu.add(mSettingsTitle);
             menuItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
             menuItem.setIntent(mSettingsIntent);
         }
+    }
 
     protected void onInstallSwitchBarToggleSwitch() {
         // Implement this to set a checked listener.