Merge changes Ifb5507cb,Ide044cf9

* changes:
  Update BT header using BT metadata
  Add layout for advanced BT detail header