Merge "Update bouncer delay (behind flag) from 250ms -> 500ms" into udc-dev