Merge "Fix margin in Tap & pay -> Payment default." into nyc-mr1-dev