Merge "Fix black wallpaper after repeated crashes" into nyc-mr1-dev