A written demand filed with the limited partnership under Section 153.403 tolls the statute of limitations on the claim on which demand is made until the later of:
(1) the 31st day after the expiration of any waiting period under Section 153.403; or
(2) the 31st day after the expiration of any stay granted under Section 153.405, including all continuations of the stay.