DeviceSettings: fix overlay

Change-Id: I289722ab842d1b680f780cba2c9e1c85e6f74b5b
Merge branch 'cm-10.1' into martincz