Merge "Revert transition codes in SettingsLib" into sc-dev