Merge "Add overlayPaths to ApplicationInfo" into sc-dev