Merge "Fix EditText RenderNode invalidation bugs"