Merge "Fix NPE in layer destruction"