Merge "Add temp config for auto data switch roaming" into main