Merge changes Id3aaa354,Ia2782c7c into tm-qpr-dev

* changes:
  Revert "Revert "[Bouncer] refine entry for bouncer user switcher.""
  [Bouncer] Have initial message id for sim pin.