Merge "Remove old code relating to SystemSettings not used in new IA."