Merge changes I667e7cf9,I06a7133e into sc-dev

* changes:
  Fix flaky test in LocalDisplayAdapter
  DisplayModeDirector: Prefer the default mode if available