Merge "[Bouncer] Reset y translation and alpha" into tm-dev