Fixed TextField problems (#13220).

Change-Id: Ib49469b3ae55cb1521451377d960fea2c99a9a25