am bc932579: Merge "Fix crash when scrolling a layer"

* commit 'bc932579ea35c6274c5a94c683c665a4d5bb3567':
  Fix crash when scrolling a layer