Merge "Fix issue #5342788: Setting wallpaper from gallery set default..." into ics-mr0