Merge "eap: do not reset the connection on updating decorated anonymous identity" into tm-dev