Merge "Don't hold a lock while loading default wallpaper" into nyc-mr1-dev