Merge "Deprecate "phone_switching_supported" key in Settings Provider" into main