Merge "Introduce MockLocationAppPreferenceController"