Merge "fs_mgr: remount reboot if overlayfs got setup"