Merge "close() database should close the db no matter what the ref count says"