Merge "Fix wallpaper screenshot" into pi-dev
am: 76439d832f

Change-Id: I210a59ff34c6136a683db5eee2080c297c8867ce