Merge "Null check overlayPaths/resourceDirs when applying widget changes"