Merge "Add shell command to trigger ECBM mode Fix EmergencyCallBackMode dialog Overlaid issue" into sc-dev