partial merge [Bug 830644] [Evme] [Hidpi] Support high resolution devices