Merge "TextView setOverlappingRendering must be true when shadows are used."