Merge "Fix for crash due to user unlock and start race condition" into sc-dev