Merge "Switch activity relaunch to lifecycler"