Merge "Do not destroy CustomTile when in QSCustomizer"