Merge "eap: update pseudonym only when pseudonym is decorated" into tm-dev