Merge "Verify if overlay exists before applying it" into sc-dev