Merge "Fixes testResumedWhenRecreatedFromInNonFocusedStack" into rvc-dev