Merge "Specify the component for the ACTION_SHOW_ECM_EXIT_DIALOG Intent" into rvc-dev