Merge "Don't crash apps due to race condition." into sc-dev