Merge "[Bouncer] Move bouncer expansion callback out..."