Merge "Use overridden default xml for TwoPanelWorkspaceTest" into tm-qpr-dev