Correct active display settings naming
Merge branch 'cm-10.2' of https://github.com/jppeniche/android_frameworks_base into cm-10.2