Merge "Detect when BT Pairing Dialog is Incorrectly Shown" into gingerbread