cm: Re-add WallpaperPicker

 * And a little OCD organization

Change-Id: I139a0a704a06fae581175e6523a34e372e04646b
1 file changed