Merge changes I2a9be009,I5c7b2bef into main

* changes:
  SF: Fall back to pacesetter in getDisplayStats
  SF: Pass display ID to updatePhaseConfiguration