Merge "Revert "Added UNDERLINE_HEIGHT property to TextLabel to override adaptor metri...