Merge branch 'master' into 20835-getting-started-better-empty-state-for-activity-tab

52 jobs for 20835-getting-started-better-empty-state-for-activity-tab in 79 minutes and 6 seconds (queued for 39 seconds)