Merge "Guard against the NPE in setPreferenceIcon()" into tm-dev