Merge "Make pm#resolveIntent resolve non-exported components" into main