Merge "Setting a wallpaper must be synchronous" into oc-mr1-dev