Merge "Add flag for async bouncer." into tm-qpr-dev