Cleanup HTMLActivity & LocalStorage
Fix Android Catalog import