Merge "Update current device when volume control id changes" into udc-dev