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