Merge "Prevent early destroying HotspotTile" into rvc-dev am: 0fcf7f11a7 am: dbede7b46e am: fa129b311e

Change-Id: I6aaeec8939ec1b8786dae36f97310ff4fad781c1