Merge "Update the usage of getDefaultUserIcon"