Merge "Deprecate account-specific activity subclass"