Merge "WM Jetpack interface update in Settings" into sc-v2-dev