Merge "Fixing pin_too_short text"