Merge "Restrict legacy apps to insert files to other private app dirs" into sc-dev