Merge "Merge "Revert "Avoid creating new instance on top when started for...
Merge "Merge "Revert "Avoid creating new instance on top when started for resu..."" into rvc-dev am: e44eb5b9 am: bf01d309" into rvc-d1-dev-plus-aosp am: f09f6432 am: f93ddbb7
Change-Id: I1f4e5cd613a8c42b7a30242de5bb01969bd71ae8