Merge "Ensure wallpaper hint is at least as large as the display." into klp-dev