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

Change-Id: Ifb94e4471267b3c89ec591a45b8b091227713458