Merge "Config to disable AOD wallpapers"