Merge "[1/3] VDM Activity control APIs" into main