Merge "Added restriction that disallows ability to set wallpaper. BUG: 24890474"