Merge "Prevent early destroying HotspotTile" into rvc-dev am: 0fcf7f11a7 am: 59ad7292f0 am: 6d1377a3d3

Change-Id: Ic5e031bac508543c263cc41dd3b613b388b534b1