Merge "Prevent early destroying HotspotTile" into rvc-dev am: 0fcf7f11a7 am: 59ad7292f0

Change-Id: I8919d4c46ed8d27eef87ffb3a301711cca190081