Merge "Show dialog on BT entries in Settings" into main