Merge commit '10146f239ca4c6300fa2513b3da0e34ad3a27fb4' * commit '10146f239ca4c6300fa2513b3da0e34ad3a27fb4': Allow wallpaper picker to work.
Merge commit '10146f239ca4c6300fa2513b3da0e34ad3a27fb4' * commit '10146f239ca4c6300fa2513b3da0e34ad3a27fb4': Allow wallpaper picker to work.