Merge "Don't lose dialogs during configuration change"