Merge "PIN Bouncer: Fix margins" into sc-dev