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 am: 0e140d2c
Change-Id: I12cb82dd9cd69ebea75a60b27bac828a7a432517