Merge "Use standard preference layout for wallpaper picker" into oc-dev