Revert "Fix custom device display settings"

This reverts commit 66002f3df86342f5fed36f717c6177adccecc629.

Change-Id: I6fead4dc520516ca4961732b864462a9dbfafb6b