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

Change-Id: I35b0b5f5b6b083df6be10e78b590341be64eb074