Merge "Don't cause infinite loop if windows manager crashes in safe mode" into pi-dev