Cherry-pick EV.me HIDPI: 3ee62a4fb004fc5f8f81b829845a2d46539efcea