Merge "[Bouncer] ensure that bouncer expansion callback.." into tm-qpr-dev