Merge "Revert "Move ETM decode back to idle processing stage"" into main