Revert "Fix custom device display settings"

This reverts commit 8a0b72555e8e3c2e372acce336a54cb219e94e1c.