Revert ""Try to fix build again, update and fix display_settings.xml"

This reverts commit 5cf46642f2a645596b04d488c2c3da69aeca26e5.
  I will add a new thing!