Merge "Add new expandable preference component" into sc-dev