This reverts commit 231d97ea. Migrating to AndroidX Fragments seems to have some unforseen side effects and no clear benefits