Merge "Add config flag to specify if wallpaper is rendered" into pi-dev
am: c0f8eb345a

Change-Id: Icc3778801aad786bc9cd2ee01be93c70b9158c82