Merge "Fix remounting overlay tests failure"