Merge "Revert "Deprecate `setDatabaseEnabled` and `getDatabaseEnabled`"" into main