Merge "Consolidate SystemUI SharedPreferences."