Merge "Avoid applying weird wallpaper offset" into udc-dev