Merge "Remove unnecessary calculation of display configuration" into tm-qpr-dev