Merge "Fix Work Challenge / personal confirm credential is shown on top of keyguard after rotation" into nyc-dev