Merge "Wait a little longer to hide wallpaper" into pi-dev
am: b6c3f32506

Change-Id: If42296d336fd823a9ea148da26f8dbe5ea5811a1