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