Merge "Nullify the default wallpaper component if it does not exist" am: b25a4d60e6 am: ae7bf51ae5
am: 83735846d4

Change-Id: I866c756b67c19a54e8a52fba9a85ceb5e16076f0