Merge "Use Builder for ActivityView"