Merge "Display-level relative display rotation should be 0" into tm-qpr-dev