Reorder Display settings and move some settings under the Advanced Category.

Change-Id: Ia88636513f61a4af1db54e7fa68ab10045de49eb