Merge "Check if ActivityView is non null in usingActivityView check"