Merge "Removing some dependencies on Activity" into main