Merge "Fix NPE of mDismissListener in Rename Dialog"