Merge "Visibility fixes for text related tests."