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

Change-Id: I03cdecc05ab9247d35a35caff986948fa008cadc