Merge "Schedule local activity relaunch" into pi-dev