Merge "Removing remaining references of ActivityView in fw/base" into sc-dev