Fixes to parent fragment names and other manifest issues.

Bug: 5324865

Also, when jumping into a second+ level setting, make sure the header list
item is scrolled into view.

Change-Id: I714c1f80c8b20e23208763f1c30449a49f2a4082
diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java
index 14ac78a..6e0ce4c 100644
--- a/src/com/android/settings/Settings.java
+++ b/src/com/android/settings/Settings.java
@@ -190,6 +190,7 @@
                 mCurrentHeader = parentHeader;
 
                 switchToHeaderLocal(parentHeader);
+                highlightHeader();
 
                 mParentHeader = new Header();
                 mParentHeader.fragment
@@ -217,6 +218,7 @@
             Integer index = mHeaderIndexMap.get(mTopLevelHeaderId);
             if (index != null) {
                 getListView().setItemChecked(index, true);
+                getListView().smoothScrollToPosition(index);
             }
         }
     }