Merge "Handle case in WindowManagerShellComand" into main