Merge "Add emulator support for 280 and 360 dpi" into studio-1.4-dev
automerge: 0e04a7c

* commit '0e04a7cd7ac88ec850a24d15a884a52663ca82d5':
  Add emulator support for 280 and 360 dpi