Add wallpaper pickers to seperate package [2/2]

Change-Id: I94473367f6d99301a3c0e5012b832a7d3c9111a7
Fix

Change-Id: Ie7596dbfb7d94cf7ed2792f7e0a7a0bd08cc546f