Merge "Fix for testLifecycleOnMoveToFromSplitScreenRelaunch" into pie-gsi