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
Change-Id: Ib910d958ac389092cfc23ba4479f43dec568209e