Merge "[ECM] Defer changing op mode to MODE_DEFAULT" into main