Merge "Fix multi-display nav bar tests on large screen devices" into tm-qpr-dev