Remove DisplayColor and Gamma

This time in the right way
Reset DisplaySettings.java
Remove DisplayColor and Gamma
Reset displaysetting.xml