Merge "Add zoom support to lock screen wallpaper" into rvc-dev