Merge "Fix TextDropShadowCache infinite loop"