Merge "Fix old style edit text drawable display error."