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

Change-Id: Ie3b0e16f39ae9879ff9ba73c477246a6db17de65