am 7f00c22b: Merge "Avoid duplicate dialogs leading to NPE" into ics-mr0

* commit '7f00c22b7fa7b38b644585c0a3c6faadc5def94c':
  Avoid duplicate dialogs leading to NPE