Finish Display Settings revamp

Change-Id: If8d2034c09b361a09d3319760d5daf30b19cffe4