Merge "Fix size and gravity of carrier text"