Merge "Add a flag to enable independent lock screen live wallpaper" into tm-qpr-dev