Merge "Revert "Fix User Switch Timeout Issue"" into main