Fix custom device display settings

*for bacon

Change-Id: Id1fa7da48d58924bb7a661dad2834ac98241b36e