Merge "SQLiteCursor must be closed before throwing exception" into rvc-dev