Merge "Added padding to PIN layout status and carrier text"