Merge changes If83c9084,Iee87316e

* changes:
  SF: Identify the active display with its ID
  SF: Refactor setter for DM and override policy