Merge "Prevent early destroying HotspotTile" into rvc-dev am: 0fcf7f11 am: dbede7b4 am: fa129b31 am: 272addff Change-Id: I5bf1faf5f21462c99f4fc73037da6795af560653