Merge branch 'rebased-redesign' into 'master'

components/settings/common/alert-error.js

components/settings/common/confirm-with-password.js

components/settings/common/password-field.js

components/settings/common/settings-button.js

components/settings/data-management/delete-data.js

components/settings/data-management/export-dialog.js

components/settings/data-management/import-dialog.js

components/settings/data-management/index.js

components/settings/index.js

components/settings/license.js

components/settings/menu-item.js

components/settings/nfp-settings/index.js

components/settings/nfp-settings/slider-label.js

components/settings/nfp-settings/temp-slider.js

components/settings/nfp-settings/temperature-slider.js

components/settings/nfp-settings/use-cervix.js

components/settings/password/create.js

components/settings/password/delete.js

components/settings/password/enter-new-password.js

components/settings/password/index.js