am 7a5a50c1: Merge "Bug 5513073 - IllegalArgumentException: View not attached to window manager" into ics-mr1

* commit '7a5a50c12f6a6e094d1e8aa7514df37f1176354a':
  Bug 5513073 - IllegalArgumentException: View not attached to window manager