Merge "fs_mgr: overlayfs: if existing scratch mountpoint is system_empty"