Merge commit '0067987bcb374646df59338eeeaec01e9b8bb73d' * commit '0067987bcb374646df59338eeeaec01e9b8bb73d': Fix issue 2091594: music chirp after disconnecting A2DP.