Merge "Fixes testResumedWhenRecreatedFromInNonFocusedStack" into rvc-dev am: 0a79590d2b am: 416abcbe64

Change-Id: I11bd5d0643a5ac052233605c8b836e212f18ccbd