Merge "[Bouncer] Refine entry animation scrimmed." into tm-qpr-dev