Merge changes I8cb45020,I8787dcca

* changes:
  SF: Remove display config functions from HWC2
  SF: Clean up Scheduler::registerLayer