Merge "Move non-settings-specific logic to frameworks/base" into sc-dev