Merge "Initial commit for Settings component test" into sc-dev