Merge "SF: Fix emulator DPI" into rvc-dev am: 4b9467baec am: d4cdf23e64 am: e585f72313 am: 6f67eaf990

Change-Id: I77cab336291fab7d0318314fe87aee9af05a2b5a