Merge "Revert "Clear out tuner prefs since it is disabled"" into pi-dev