Merge changes Idf36e20c,Idf9f43b3,I420058ae into udc-qpr-dev

* changes:
  ui: Pull DisplayMap.h from SF
  SF: Encapsulate frame targeting
  SF: Redefine VsyncId using FTL mixins