Merge "Fix the ECBM dialog is not shown issue"