Fix a bug in the asset manager's change handling where a layer would be overwritten by its dependent layers
Merge remote-tracking branch 'origin/iwehrman/v2' into ps-next