Merge "Add null check for base activity" into sc-dev