Merge "Prevent NPE in CustomTile" into rvc-dev