Merge "Add tests for text layout cache"