Merge "Don't remove permission when cleaning up orphaned tree on uninstall" into tm-qpr-dev