Merge "[Bouncer] Update colors for pin pad" into tm-dev