Settings: Danish latest merges

Patch 2: Suggestion from review

Change-Id: I5043120b984b14f848c09a8da27df5f501a1804d
Merge "Settings: Danish latest merges" into cm-10.1
Merge remote branch 'cm/cm-10.1'