Merge "Recover shady content:// paths."