Indicator: upstream changes and port to GSettings