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

Change-Id: I9df3a3df3e4b166cdf3967158c1453321cf438bb