Merge "Refactor usages of getAliasName to use getAlias in Settings"