Settings: preferences use keys, not ids

Change-Id: I23fad40f85235db1fd2c5724ba9d3580828b14d7
Merge "Settings: preferences use keys, not ids" into cm-11.0