Merge "Fix lock wallpaper backup & restore" into nyc-mr1-dev