Merge "Add more intelligence to bluetooth connection state" into mnc-dev