Merge changes I0f351991,Iec79211e

* changes:
  Simplify canceling the bond process
  Simplify adapter and profile connection state