Merge "ActivityStarter cleanup"