Merge "Fix crash issue when dismiss MMI dialog"