Merge "overlayfs: Refactor how the scratch device is deduced, again."