Merge "Introduce PointerLocationPreferenceController"