Merge "The old overlay should be destroyed if orientation changes." into gingerbread