Merge "Fix scaling of workspace and hotseat with wrong pivots" into tm-dev