Merge "Fix NumberPicker text positioning."