Merge "Fix the ECBM dialog is not shown issue" into rvc-dev am: 1beaa86217

Change-Id: Ic3e43374f711e8d2481754925d492ac106aab496