Merge "Enable overlays that are pending creation" into sc-dev