Merge "Fix incremental installs with app metadata bundles" into main