Merge "Revert "Avoid creating new instance on top when started for resu...""...
Merge "Revert "Avoid creating new instance on top when started for resu..."" into rvc-dev am: e44eb5b9 am: 76aaccb9 am: 17f706c1
Change-Id: I580458d0c52c81e5e606d69ad0f889019b3fcdb6