Merge changes I546d7abc,I32163278 into nyc-mr2-dev

* changes:
  Bluetooth: fix issues re-enabling after crash
  Bluetooth: log message improvements