pickup NoWallpaper

Change-Id: I87dbf69ccdc67ab0e50a1b36daeafa2c76c24374