Merge "Bouncer refactor - prep for motion layout implementation" into main