Merge remote-tracking branch 'slimroms/kk4.4' into kk4.4
Merge remote-tracking branch 'slimroms/kk4.4' into kk4.4