Merge commit '1a797546d75d2c85d6fefeefdc55de051aa66018' * commit '1a797546d75d2c85d6fefeefdc55de051aa66018': More work on wallpapers.