Merge "Fix Info Dialog Leak" into gingerbread