Merge "[ECM] Don't set MODE_ERRORED for LOCAL and DOWNLOAD" into main