am 8e656df0: Merge "Add extras to AFD, send orientation metadata." into klp-dev

* commit '8e656df0929b352660fd6d6209eabc4267c1941f':
  Add extras to AFD, send orientation metadata.