Merge "Be more lenient about live wallpaper unavailability" into oc-dev