Lorenzo McCathie foggy-window-fix6861