Merge "Apply new settings widget lib for cbr roaming feature support" into sc-mainline-prod