Merge "Update edit text size when the text changes so scroll works."