Squashed commit: Active Display from ChameleonOS - Settings part, re-organise Display settings