Merge "Unhide VDM activity APIs"