Merge "Fix flaky/failing two panel TAPL tests" into tm-qpr-dev