Merge "Make sure to close cursors" into android14-dev