Merge "Fix memory corruption in SpotShadow"
am: 8c85c00b5e

* commit '8c85c00b5e8fffb226f4af225a67425b8d0f190b':
  Fix memory corruption in SpotShadow