Merge "galaxys2: remove DeviceSettings" into cm-10.2