Merge remote-tracking branch 'PA-settings/kitkat' into kitkat-remix