Revert "Merge "Avoid duplicate dialogs leading to NPE" into ics-mr0"

This reverts commit 7f00c22b7fa7b38b644585c0a3c6faadc5def94c, reversing
changes made to 451fa13e82ea1226895b41282fdb33bf9fea5d19.
1 file changed