Merge "Fix issue with PIN output content not center aligned as expected." into main