Merge "[MEP] the user can't enable the psim when revmovable esim is enabled" into tm-qpr-dev