Merge changes I63f2a34e,I3e95be93

* changes:
  [sf] Pass metadata to layer during composition
  [sf] Add support for generic layer metadata to HWComposer and HWC2