Merge "Catch exceptions when setting wallpaper offsets" into jb-ub-gel-agar