Merge "Rename data/pkg_staging to data/app-staging"