Merge "Prevent debugfs unmount on debug builds with a persist property"