Merge "Cleanup unused icon labels shared preferences" into main