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

Change-Id: I8c43da05791e5eda0517c4b97318280e67fec7f2