Merge "Remove dependency of SudGlifTheme from SettingsTheme" into tm-dev