Merge "Fixes AssistOrbController crash" into sc-qpr1-dev