Merge "Add test for vertical and horizontal split apps" into tm-qpr-dev