Merge "Remove unneeded cast to SettingsActivity" into main