Merge "Support e2e in controls activities" into main