Merge "Fix crash in ExternalSourceDetailPreferenceController." into pi-dev
am: 5ddff9371d

Change-Id: I26b3122b17b71e9729d198bcbaa8f1620c40e06e