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

Change-Id: Ib00fe9b564cd63d3f6b47a6545cdaae0734abfcb