Merge "Add extras to AFD, send orientation metadata." into klp-dev