Merge "TextField is re-laied out after its properties are changed." into devel/master