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

Change-Id: I83f82ba80e1a7bf1f79018e50039b53d955c44e3