Merge "Fix bug #12467741 Java crash in com.android.settings: java.lang.IllegalStateException: The content of the adapter has changed but ListView did not receive a notification."