am 06a0c3a4: Implement nice transition for unlocking while QS is open
automerge: d604794

* commit 'd6047940cd2c0235c53c02b620910ff59a966618':
  Implement nice transition for unlocking while QS is open