Merge "init: simplify queue_fs_event()" into main