Merge "Proper handling of A2DP connetion timeout scenarios"