Merge "Always queue A2DP connection state message with wakelock held" into jb-dev