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