am 876b0644: Fix 2555028: Restore showing tab unlock before PIN & password entry.

Merge commit '876b0644770d1790b21e4049bc7f40851045dc86' into kraken

* commit '876b0644770d1790b21e4049bc7f40851045dc86':
  Fix 2555028: Restore showing tab unlock before PIN & password entry.
tree: f11e1a1b9ae0c99cd6297f779a4fd44dde8a397c
  1. policy/