Merge "Clean-up usage of the old system UI flags in DisplayPolicy"