Merge "Add activity null checks and extra logs" into main