Merge "Deprecate AliasActivity"