Merge "Fix for testLifecycleOnMoveToFromSplitScreenRelaunch"