Merge "Add AUTH_SCRIMMED state to ScrimControllerTest" into sc-dev