Merge "FUSE-BPF: use both ro and persist properties" into tm-dev