Fix window controls (popouts and visual refresh) and focus window method by patching window controls wrapper module#1104