Merge "Sync hotseat/taskbar handoff" into tm-dev