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

Change-Id: I9a01944dec9c5e6c3366ddf62e9bc9a04e757e4f