Merge "Fix ActivityView surface can't visible for ActivityViewTest"