Merge "Avoid crash when setting buffer on deleted layer" into oc-dev