Merge change 26878 into eclair

* changes:
  b/2140751 Fixed the problem where BT device icon was showing until pairing happens (actually UUID comes in to be exact)