Merge "Avoid crash when setting buffer on deleted layer" into oc-dev
am: 6dbaf573a2

Change-Id: I919634ebcd7ff859cd6d52fcc95747810d1fd911