Merge "Demote fallback to client composition logs to DEBUG_LOG" into tm-dev