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