Merge "Prevent early destroying HotspotTile" into rvc-dev am: 0fcf7f11 am: dbede7b4 am: c3a1cde3 Change-Id: I03b892fb43f29030827fec580e36a2d332940ede