Merge "Schedule local activity relaunch" into pi-dev
am: 1ed9f4294c

Change-Id: I7ff272e057bed855ce187aa759f197807a50d683