Merge "Use normal API for legacy wallpaper restore" into oc-mr1-dev