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

Change-Id: I79366dc61dc19cd7ec6ede0cbceb4912b78684cc