Merge "Rebase enabled overlays for every PackageParser.generateActivityInfo() call" into oc-dev