Merge "Add a new persistent FUSE flag in Settings"