Merge "[logging] Move session id tracking to DesktopModeLogger" into main