What Should I Do About My Multiple Entry NON-O Visa and the 90-Day Reporting During the Border Closure?

Hello, all

This is my first post. Firstly, let me say that I have scanned through the posts to hopefully not ask a repeated question, but I would still just like to make sure that I understand everything correctly.

I am on a Multiple Entry NON-O. I have never done a 90- day reporting as I normally just leave the country before the 90-days are over and re-enter the country (border run). (I know this is not ideal, but it works me (smiling)). My current Visa expires in December 2020 and my last entry stamp expires on 21stof May 2020. (Attached)

1. Am I correct in saying that I just need to sit tight and wait for the borders to re-open?

2. Am I covered by this amnesty thing until the 31stof July 2020 or until some borders re-open and I can exit and re-enter the country?

Sorry if the has been asked (I could just not find an example similar to my situation) and thank you for the answers in advance.

Regards