Merge changes I5c6ad4b3,Icb00b3fc

* changes:
  [MEP] renew the default data selection UI
  [MEP] renew the sim confirm dialog UI