The notices I have seen from the immigration office explicitly mention tourist visas only, so I have no idea where I stand right now.
Honestly? I'm expecting the virus to overrun immigration staff soon and for them to just announce an amnesty. It's ridiculous to have people queuing up in Imm offices right now.