Merge "Revert "Switch device to multiSIM mode before""