Merge "Recover shady content:// paths." into nyc-dev