Merge "Handle navigation back problem from About Phone"

        <activity android:name=".Settings$MyDeviceInfoActivity"

                  android:label="@string/about_settings"

                  android:icon="@drawable/ic_homepage_about"

                  android:parentActivityName="Settings">

                  android:icon="@drawable/ic_homepage_about">

            <intent-filter android:priority="1">

                <action android:name="android.settings.DEVICE_INFO_SETTINGS" />

                <action android:name="android.settings.DEVICE_NAME" />