Merge "Update text input layout style and fix focus bug."