Merge "Removing some usage of shared prefs" into main