Merge "Fix a race when an editText was removed and added immediately again" into main