I wouldn't quite go so far as to say back to normal...
But yeah it's under control.
For example I (still) have to buy orange juice for my work, because I offer it to my customers. But at the 3 major grocery stores in downtown Sannomiya (Heart of Kobe city, an import haven) the shelves were out of stock of almost any kind of bottled beverage.
Found that pic!
At Daiei next to JR Sannomiya March 26th