Merge "Workaround libmemunreachable lockup"