Merge "Fix display cutout vertical centering bug" into tm-qpr-dev