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