Upgrading the O365 version seems to get stuck forever on "Update V2.1.1 is completing".
When I navigate to the helpdesk, it appears to have applied all the modern content, but the settings page is still showing the upgrade is in progress. I have tried this twice now - I left it overnight and the settings page went back to saying it was the old version, so I tried updating again and it hasn't completed this time either.