Merge "Fix DPI issues in RS tests."