Merge "Add DisplayModeDirector to determine set of allowed modes."