Merge "Call close() instead of deactivate() in CursorToBulkCursorAdaptor.close()"