Merge "Split interfaces and service for activities from current AM interfaces (1/n)"