Merge "Prevent edit state workspace scale from hiding next pages." into tm-dev