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

Change-Id: I85005e8c39ecdaf98ea40c848496d808fb05e8f1