Merge changes I8982b986,I1a68a8b8 into main

* changes:
  Call showNextSecurityScreen when simstate changes.
  Do not show primary auth when finished auth sim