Merge "Make Activity.removeDialog() less strict." into gingerbread