Merge "Added padding and gravity support to PIN entry" into nyc-dev