Merge "Handle empty/unspecified crop properly in wallpaper restore" into nyc-mr1-dev
am: 0b26adbb8b

Change-Id: Ic7b8e2dc5bf39553b1036fad8e871b5fdb51c74f