Merge "close() on anything other than database shouldn't acquire db lock."