am 7b8bec28: Merge "PopupWindow dismiss() can get into a recursive loop." into ics-mr0

* commit '7b8bec280f20e8a5863d8214bbc195497335eba6':
  PopupWindow dismiss() can get into a recursive loop.