Merge "Fix for testLifecycleOnMoveToFromSplitScreenRelaunch" am: 43d11758fa am: 0f174795e4
am: 03549b860a

Change-Id: I4d6037597d60b5990db0b95bdee3cb69c500ec49