Add missing ListPreference from merge

Change-Id: I316894e5fc931266ed36d6686dbbe970f1f2d909