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

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