[automerger skipped] Merge "Nullify the default wallpaper component if it does not exist" into pi-dev am: 3f3c8f812e -s ours
am: bbab911f29 -s ours
am skip reason: change_id I9d618d05458a03a675324cb2f861decf31c5bf18 with SHA1 1c7ae31e97 is in history

Change-Id: I463ab30c2c0662cc2c095ceea751cab90ad364da