Merge "Fix intent in HotspotTile" into sc-qpr1-dev