am af0dd9f0: Merge "Stk: Fix crash due to race condition"

* commit 'af0dd9f082ff3ab5295cbf00eb2ea6d8db820ce6':
  Stk: Fix crash due to race condition