Merge "Set display size to all displays" into tm-qpr-dev