Merge "Fix wallpaper restore from pre-N devices" into nyc-mr1-dev