Merge "Only enable overlay where package is installed" into sc-dev