Merge "Stk: Fix crash due to race condition"