Merge "Remove old code from DisplaySettings not used in new IA."