Merge "Fix up mangled SELinux labeling of wallpaper files" into nyc-mr1-dev