Merge "fs_mgr: support -o sync" into qt-dev