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

Change-Id: I58152c38fd478978c7fb1454537ed3fc0f8eb644