Merge "Do not stop wallpaper chooser activity"