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

Change-Id: Ie32376993dcc8b06f3d2254d6aecdb9a4f843236