Merge commit 'f9ca318a' into HEAD

        </activity>

        <activity android:name="Settings$WifiDisplaySettingsActivity"

                android:uiOptions="splitActionBarWhenNarrow"

                android:label="@string/wifi_display_settings_title"

                android:taskAffinity=""

                android:excludeFromRecents="true">