Merge "[Bouncer] Add more padding top for bouncer." into tm-qpr-dev