Merge "Fix empty value problem in the TextEntry"