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

Change-Id: Ic025acecd66d1be07cec93ccac6cbaa3c6105256