Pie Settings: Final fixes
Merge remote-tracking branch 'settings/kitkat-staging' into kitkat-legacy-staging