Merge "Apply new settings widget lib for the cbr main feature switch" into sc-dev