ComfortDelGro, SMRT to waive taxi rentals