Merge "[Bouncer] Fix vertical spacing between buttons." into tm-qpr-dev