Merge "Fix TwoPanelWorkspaceTests" into tm-qpr-dev