Merge "Revert "Fixup app-private dirs that are not writable."" into sc-dev