Merge "delete DeviceInfoSettings and activity, pref xml"