Merge "Check against STATE_AUTH_STARTED_UI_SHOWING instead" into sc-dev