On the brighter side, during troubleshooting I finally got around to re-installing some of my apps via F-Droid....