Merge "SF: Fix emulator DPI" into rvc-dev