Merge "Smart Router settings UI changes" into sc-dev