Merge "Icon overlay on QSTileBaseView"