Merge "Close tz query cursor when done." into gingerbread