Merge "IndexOutOfBoundsException on addPreference in PreferenceGroup"