Merge "Reset wallpaper state during startup" into pi-dev
am: 6b89784691

Change-Id: I77b1bb00a5b55bb9eb189e981f0bc13217b85260