Merge "Remove losing focus window list"