Merge "Allow start custom activity for catalyst test" into main