Merge "Revert "fs_mgt: Fix remount failure in case of non-overlayfs system""