Merge "Bring back gear icon for advanced app settings" into mnc-dev

    <item

        android:id="@+id/advanced"

        android:title="@string/advanced_apps"

        android:showAsAction="never" />

        android:icon="@drawable/ic_settings_24dp"

        android:showAsAction="collapseActionView|ifRoom" />

    <item

        android:id="@+id/show_system"

        android:title="@string/menu_show_system"