Merge "Fixes activity leak in Wallpaper Picker." into udc-dev