Merge "Fix for testLifecycleOnMoveToFromSplitScreenRelaunch"
am: 43d11758fa

Change-Id: I6b248297523070983c63b5dd870e235eea5ee59c