Merge "Fix UserAvatarView.setDisabled method."