Fix webview state machine for redirect

-RTC number 33742
-referenced JIRA items CB-3530 and CB-3567