Merge "Add SwitchParent api in actor-devel" into devel/master