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

Change-Id: I23440f9c98974e369272e8744ce33537a5e3380b