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

Change-Id: Ie027fd728ba7923751baaf830d9412e36a90cdeb