Merge "Fix A2DP device is not made active when connected" into udc-qpr-dev