Merge "Improve TaskMenuView layouts for split pairs" into tm-qpr-dev