Merge "Remove volume_separate_notification flag" into udc-dev