Merge "Fix a Cursor leak if cursor doesn't have any content" into gingerbread