Merge tag 'android-4.4_r1.2' into cm-10.2

Android 4.4 Release 1.2
Merge "QuickSettings: Port from cm-10.2 (Squashed commit)" into cm-11.0