Merge "Sort hotseat items in migration to preserve position" into tm-dev