Merge "RESTRICT AUTOMERGE: Recover shady content:// paths." into oc-dev