Merge "Fix User Switch Timeout Issue" into main