Settings: Use US spelling of behaviour

Change-Id: I75d2f4d35e29fe9cd4da3852f2579804910a6dfc
Merge remote-tracking branch 'cm/cm-10.2' into cm-10.2