Merge "Add emulator support for 420 dpi" into studio-1.3-dev