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

* commit '02018f8babe7be237dc9f80f93edbe32a8de47e3':
  Add emulator support for 280 and 360 dpi