Merge "Grant Permanent Write Uri Permission" into main