Merge "Properly check wallpaper state before showing suggestion" into oc-dev