Merge "Fix orientation changes for wallpaper setter." into gb-ub-photos-bryce