Merge "Clean-up DisplayPolicy"