Merge "Enable settings transition" into sc-dev