Merge "Revert "Revert "Skip restore of read-only directories""" into sc-v2-dev