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: 12a732ba am: 89578eb9
Change-Id: I777578c7aba669d1f41ffacd870cce073766d2e9