Merge "Delete unused SystemUI tuner prefs code" into main