Merge changes from topic "cbr-roaming-support"

* changes:
  [automerge] Apply new settings widget lib for cbr roaming feature support 2p: d5d275c90c
  Apply new settings widget lib for cbr roaming feature support