Merge "Prevent early destroying HotspotTile" into rvc-dev am: 0fcf7f11 am: 59ad7292 am: 6d1377a3 am: f5ab21ef Change-Id: I69835e16c0381d308a2a0c50b012a62d47acf046