Merge "Fix DPI scaling on TVDPI" into jb-mr1-dev