Wallpaper picker fixes
am: cb4a870795

Change-Id: I8a2c8af0df87262ca997eb3fdfb1667e1ea02871