fix displaySettings fc & re add Advanced Settings under Display

Change-Id: I0742dc91db170b50b80223862bb2cafde2a87532