Merge "Fix SecurityException when exiting wallpaper picker early" into ub-now-master