Merge "Increase text layout cache size in bytes"