Merge "accept close() on database objects even if the database is closed" into froyo