Merge "Clean up async bouncer flag" into udc-dev