Merge "Track both framework and app overlays per package" into oc-dev