Merge "Separates home and lock wallpaper metadata" into tm-qpr-dev