Merge "Handle intermediate task overlay for metrics logger" into tm-dev