Merge "Handle Looper in PreferenceController"