Merge "Use transaction for local activity relaunch" into pi-dev