[automerger] Wallpaper picker fixes am: c382adc882

Change-Id: Ib2480b18ae7bae61e5b29ba58c941bf4c84f7906