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

Change-Id: I5713bd059a0fa6c5ed49cd5523082263bf17e19b