Merge "Fix ECbM Exit Dialog Issue"