Merge "Disable RAT/SS auto data switch" into main