Merge commit '83c36fcbd4fac92540e207cab94b0295f5de5dbe' * commit '83c36fcbd4fac92540e207cab94b0295f5de5dbe': Fix issue #2097189: can't set custom wallpaper
Merge commit '83c36fcbd4fac92540e207cab94b0295f5de5dbe' * commit '83c36fcbd4fac92540e207cab94b0295f5de5dbe': Fix issue #2097189: can't set custom wallpaper