Merge "Add way to set live wallpaper across users" into nyc-mr1-dev