Merge "Fix physical display ratio incorrect" into tm-dev