Merge changes I0a4a57b6,I6260ae16

* changes:
  SF: Generalize display management
  SF: Fix HWComposer destruction order