Merge "add vp10 ActiveMap/ActiveMapRefreshTest" into nextgenv2