Merge commit 'f6d2ccc19f2f4ef3f5dc1efe2d97549146ce7bab' * commit 'f6d2ccc19f2f4ef3f5dc1efe2d97549146ce7bab': Really fix issue #:2097189 can't set custom wallpaper
Merge commit 'f6d2ccc19f2f4ef3f5dc1efe2d97549146ce7bab' * commit 'f6d2ccc19f2f4ef3f5dc1efe2d97549146ce7bab': Really fix issue #:2097189 can't set custom wallpaper