Merge "passpoint-r2: make the redirect server socket closable"