Settings: Cleanup display settings code

Change-Id: Ib2a00bd7f7932ca6a75834e3cd5b4953d5b050de
(cherry picked from commit 14ec0399391c447f89772983f962f0f10dca09c5)