Merge "Add DisplayModeDirector support for UDFPS" into sc-dev