Merge "Cleanup removal of taskbarSize from calculation" into tm-qpr-dev