My friend is having the similar situation and she is also wondering what to do.
From what I read, it says "whichever is first" so I don't think you can continue working after Mar 31, 2022 (but I might be wrong).
I would also like to know if anyone else know about it! Thx!