Merge "Fix black wallpaper after repeated crashes" into nyc-mr1-dev am: 56a70e3865 am: dfc195b4b6
am: b639b861cd
Change-Id: I2b17e15e159903df15330b97f6bda90c4e4dbaa6
This commit is contained in: