Merge "Allow second slot to be without sim" into tm-dev