Merge "Remove performRestart in performResume"