Merge "ActivityManager: Add support for agents on startup"