Merge "Include window type in relevant BadTokenExceptions"