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

* commit 'b419abcadad79cd908acfe51dc6e8902c16ff728':
  Avoid duplicate dialogs leading to NPE