Merge "Correct ACTION_SHOW_NOTICE_ECM_BLOCK_OTHERS"