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

Change-Id: I5977c2aa2a5fe2e77b595a634938025624b4acee