DeviceSettings: Place fragments into new folder and fix private branch merge error