Merge "fs_mgr_fstab: Refactor & cleanup DSU mounting logic"