Merge "fs_mgr: overlayfs: test issues with single super device"