Merge changes If5f4a7b4,Ie58b6947 into udc-dev

* changes:
  SF: Remove unused property of test DisplayVariant
  SF: Deduplicate mock scheduler setup in tests